Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix validating SAML XML schemas #754

Merged
merged 1 commit into from
Jul 21, 2023
Merged

Conversation

nickvergessen
Copy link
Member

No description provided.

@juliushaertl
Copy link
Member

juliushaertl commented Jul 21, 2023

  • We'll need a follow up issue to see how we proceed with the custom patched 3rdparty

Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works

@nickvergessen
Copy link
Member Author

We can also move the patch outside, and wrap each 3rdparty interaction instead

blizzz
blizzz previously requested changes Jul 21, 2023
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's not patch third party, packaging might override it

@blizzz blizzz requested a review from juliushaertl July 21, 2023 15:13
@blizzz blizzz dismissed their stale review July 21, 2023 15:14

resolved

@blizzz
Copy link
Member

blizzz commented Jul 21, 2023

@nickvergessen @juliushaertl did the adjustments, and it is working on my test setup. If I get green lights from you, I'd clean up the commits before merging.

Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works here as well and code looks good 👍

@patschi
Copy link
Member

patschi commented Jul 21, 2023

FWIW, I was experiencing same issues and driving me insane. Narrowed it down to XML validation today morning and woke up with your fix - appreciated! Applying this patch fixes it in my affected setup with ADFS too.

@blizzz blizzz merged commit a5ca6ff into master Jul 21, 2023
31 checks passed
@blizzz blizzz deleted the bugfix/noid/fix-XML-loading branch July 21, 2023 16:18
@blizzz
Copy link
Member

blizzz commented Jul 21, 2023

/backport to stable-5.1

@backportbot-nextcloud
Copy link

The backport to stable-5.1 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-5.1
git pull origin stable-5.1

# Create the new backport branch
git checkout -b fix/foo-stable-5.1

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-5.1

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@blizzz
Copy link
Member

blizzz commented Jul 21, 2023

/backport to stable-3.3

@backportbot-nextcloud
Copy link

The backport to stable-3.3 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.3
git pull origin stable-3.3

# Create the new backport branch
git checkout -b fix/foo-stable-3.3

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.3

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

ecmrauh added a commit to eid-login/eid-login-nextcloud that referenced this pull request Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SSO broken after upgrade from 26.0.3.2 to 26.0.4.2. Invalid metadata
4 participants